* src/emacs.c (standard_args) [HAVE_NS]: Remove -disable-font-backend.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0fe25e6fd63ce46f250858f690882b70378b4bcc..5933f145b488a450dc0f197b5bfb226b3eddf835 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-18  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.c (standard_args) [HAVE_NS]: Remove -disable-font-backend.
+
 2013-12-17  Eli Zaretskii  <eliz@gnu.org>
 
        * w32.c (getloadavg): Don't index samples[] array with negative

diff --git a/src/emacs.c b/src/emacs.c
index 2dfd12eff8b1682f82fa9d6158cc901541e02e93..89e04b12b458d80a7a157cd8d59147b241e324b6 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1714,7 +1714,6 @@ static const struct standard_args standard_args[] =
 #ifdef HAVE_NS
   { "-NSAutoLaunch", 0, 5, 1 },
   { "-NXAutoLaunch", 0, 5, 1 },
-  { "-disable-font-backend", "--disable-font-backend", 65, 0 },
   { "-_NSMachLaunch", 0, 85, 1 },
   { "-MachLaunch", 0, 85, 1 },
   { "-macosx", 0, 85, 0 },